From 83e37aedb900fdaa44d462f646fa1a72b8a15e26 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Mon, 9 Nov 2020 21:41:20 +0100 Subject: [PATCH] Update autopkgtests --- debian/libvtk9.install | 1 + debian/python3-vtk9.install | 1 + debian/tests/buildBoolean | 3 +- debian/tests/buildDistance | 3 +- debian/tests/buildGenericClip | 156 ---------------------------------- debian/tests/buildPNG | 3 +- debian/tests/buildPoint | 3 +- debian/tests/buildVTP | 3 +- debian/tests/buildVTU | 3 +- debian/vtk9.install | 1 + 10 files changed, 9 insertions(+), 168 deletions(-) delete mode 100755 debian/tests/buildGenericClip diff --git a/debian/libvtk9.install b/debian/libvtk9.install index 3de3b10a4..47de4b07a 100644 --- a/debian/libvtk9.install +++ b/debian/libvtk9.install @@ -1 +1,2 @@ usr/lib/*/*.so.* +usr/lib/*/vtk diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install index 49f4cdebe..6f726f373 100644 --- a/debian/python3-vtk9.install +++ b/debian/python3-vtk9.install @@ -1,3 +1,4 @@ usr/lib/python3 usr/bin/vtkpython-9.0 usr/bin/vtkWrapPython-9.0 +usr/bin/vtkWrapPythonInit-9.0 diff --git a/debian/tests/buildBoolean b/debian/tests/buildBoolean index 7a9ad1775..4c4d218ef 100755 --- a/debian/tests/buildBoolean +++ b/debian/tests/buildBoolean @@ -15,8 +15,7 @@ cd src cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6) project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) +find_package(VTK REQUIRED) add_executable(demo demo.cpp) target_link_libraries(demo \${VTK_LIBRARIES}) diff --git a/debian/tests/buildDistance b/debian/tests/buildDistance index daba45398..1bda84e23 100755 --- a/debian/tests/buildDistance +++ b/debian/tests/buildDistance @@ -15,8 +15,7 @@ cd src cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6) project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) +find_package(VTK REQUIRED) add_executable(demo demo.cpp) target_link_libraries(demo \${VTK_LIBRARIES}) diff --git a/debian/tests/buildGenericClip b/debian/tests/buildGenericClip deleted file mode 100755 index 50f7ea68c..000000000 --- a/debian/tests/buildGenericClip +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat < CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) - -EOF - -cat < demo.cpp -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int main(int, char**) -{ - - vtkSmartPointer sphereSource = - vtkSmartPointer::New(); - sphereSource->SetRadius(5); - sphereSource->SetThetaResolution(10); - sphereSource->SetPhiResolution(10); - sphereSource->Update(); - - // Add ids to the points and cells of the sphere - vtkSmartPointer idFilter = - vtkSmartPointer::New(); - idFilter->SetInputConnection(sphereSource->GetOutputPort()); - idFilter->Update(); - - // Create a plane to clip with - vtkSmartPointer plane = vtkSmartPointer::New(); - plane->SetOrigin(0, 0, 0); - plane->SetNormal(1, 1, 1); - - // Convert the DataSet to a GenericDataSet - vtkSmartPointer bridgeDataSet = vtkSmartPointer::New(); - bridgeDataSet->SetDataSet(idFilter->GetOutput()); - - vtkSmartPointer clipper = - vtkSmartPointer::New(); - clipper->SetClipFunction(plane); - clipper->SetInputData(bridgeDataSet); - clipper->Update(); - - // Get the clipped cell ids - vtkUnstructuredGrid* clipped = clipper->GetOutput(); - vtkIdTypeArray* originalIds = vtkIdTypeArray::SafeDownCast(clipped->GetCellData()->GetArray("vtkIdFilter_Ids")); - for(vtkIdType i = 0; i < originalIds->GetNumberOfTuples(); i++) - { - std::cout << "new id " << i << ", original id " << originalIds->GetValue(i) << std::endl; - } - - // Create a mapper and actor for clipped points - vtkSmartPointer mapper = - vtkSmartPointer::New(); - mapper->SetInputConnection(clipper->GetOutputPort()); - vtkSmartPointer actor = - vtkSmartPointer::New(); - actor->SetMapper(mapper); - - // Create a mapper and actor for clipping function - vtkSmartPointer sample = - vtkSmartPointer::New(); - sample->SetSampleDimensions(20,20,20); - sample->SetImplicitFunction(plane); - double value = 10.0; - double xmin = -value, xmax = value, ymin = -value, ymax = value, zmin = -value, zmax = value; - sample->SetModelBounds(xmin, xmax, ymin, ymax, zmin, zmax); - - // Create the 0 isosurface - vtkSmartPointer contours = - vtkSmartPointer::New(); - contours->SetInputConnection(sample->GetOutputPort()); - contours->GenerateValues(1, 1, 1); - - // Map the contours to graphical primitives - vtkSmartPointer contourMapper = - vtkSmartPointer::New(); - contourMapper->SetInputConnection(contours->GetOutputPort()); - contourMapper->SetScalarRange(0.0, 1.2); - - // Create an actor for the sphere - vtkSmartPointer sphereActor = - vtkSmartPointer::New(); - sphereActor->SetMapper(contourMapper); - - // Create a renderer, render window, and interactor - vtkSmartPointer renderer = - vtkSmartPointer::New(); - vtkSmartPointer renderWindow = - vtkSmartPointer::New(); - renderWindow->AddRenderer(renderer); - vtkSmartPointer renderWindowInteractor = - vtkSmartPointer::New(); - renderWindowInteractor->SetRenderWindow(renderWindow); - - // Add the actor to the scene - renderer->AddActor(actor); - renderer->AddActor(sphereActor); - renderer->SetBackground(1,1,1); // Background color white - - // Render and interact - // renderWindow->Render(); - // renderWindowInteractor->Start(); - - return 0; -} -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -echo "run: OK" diff --git a/debian/tests/buildPNG b/debian/tests/buildPNG index 5f028c300..8dbc5daeb 100755 --- a/debian/tests/buildPNG +++ b/debian/tests/buildPNG @@ -15,8 +15,7 @@ cd src cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6) project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy vtkImagingGeneral) -include(\${VTK_USE_FILE}) +find_package(VTK REQUIRED) add_executable(demo demo.cpp) target_link_libraries(demo \${VTK_LIBRARIES}) diff --git a/debian/tests/buildPoint b/debian/tests/buildPoint index 168699468..dbc9cb282 100755 --- a/debian/tests/buildPoint +++ b/debian/tests/buildPoint @@ -15,8 +15,7 @@ cd src cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6) project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) +find_package(VTK REQUIRED) add_executable(demo demo.cpp) target_link_libraries(demo \${VTK_LIBRARIES}) diff --git a/debian/tests/buildVTP b/debian/tests/buildVTP index 3f57f5a7a..ff49ddddb 100755 --- a/debian/tests/buildVTP +++ b/debian/tests/buildVTP @@ -15,8 +15,7 @@ cd src cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6) project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) +find_package(VTK REQUIRED) add_executable(demo demo.cpp) target_link_libraries(demo \${VTK_LIBRARIES}) diff --git a/debian/tests/buildVTU b/debian/tests/buildVTU index 3bb86ad6c..960e51e1e 100755 --- a/debian/tests/buildVTU +++ b/debian/tests/buildVTU @@ -15,8 +15,7 @@ cd src cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6) project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) +find_package(VTK REQUIRED) add_executable(demo demo.cpp) target_link_libraries(demo \${VTK_LIBRARIES}) diff --git a/debian/vtk9.install b/debian/vtk9.install index e2f93ce43..30059ddd8 100644 --- a/debian/vtk9.install +++ b/debian/vtk9.install @@ -1 +1,2 @@ usr/bin/vtkWrapHierarchy-9.0 +usr/bin/vtkProbeOpenGLVersion-9.0 -- 2.30.2